fix-system-lpsolve-build

Gbp-Pq: Name fix-system-lpsolve-build.diff

diff --git a/configure.in b/configure.in
index cde5d98b000b13098496668847aed81778e11d30..22c8d52a1d15e17e4b017afa2a90c72fc0cdfa04 100644 (file)
Binary files a/configure.in and b/configure.in differ

diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index a889f4416e8fca2b13adff95ea2f4bdbf7e1cb16..9bec4bd9dee93c9dcb7ef18600b22dd945d96656 100644 (file)
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -44,7 +44,13 @@ $(eval $(call gb_Library_use_libraries,solver,\
        $(gb_STDLIBS) \
 ))
 
+ifeq ($(SYSTEM_LPSOLVE),YES)
+$(eval $(call gb_Library_add_ldflags,solver, \
+       /usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
+))
+else
 $(eval $(call gb_Library_use_external,solver,lpsolve55))
+endif
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
        sccomp/source/solver/solver \

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 9d2dd1e1e81cd512910d8dacb9f7ef6e14d0a72c..47cfaf27cb0665f6a70cbc78b4cae729233a2b9a 100644 (file)
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -324,7 +324,13 @@ MYTHESLIB=$(MYTHES_LIBS)
 MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
+.IF "$(SYSTEM_LPSOLVE)" == "YES"
+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+# /usr/lib gets picked and we get a static link...
+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
+.ELSE
 LPSOLVELIB=-llpsolve55
+.ENDIF
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest